From ac7141e1cd2c089009ff19c6aeec48fbd3ac6ff5 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 6 Aug 2014 16:10:40 -0700 Subject: [PATCH] Unconditionally write Cargo.lock Otherwise `cargo-update` ends up not doing much because all sources are considered equal regardless of their precision. --- src/cargo/ops/cargo_generate_lockfile.rs | 5 ----- tests/test_cargo_generate_lockfile.rs | 3 --- 2 files changed, 8 deletions(-) diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs index ced7788ee..db0d24b2d 100644 --- a/src/cargo/ops/cargo_generate_lockfile.rs +++ b/src/cargo/ops/cargo_generate_lockfile.rs @@ -116,11 +116,6 @@ pub fn load_lockfile(path: &Path, sid: &SourceId) -> CargoResult pub fn write_resolve(pkg: &Package, resolve: &Resolve) -> CargoResult<()> { let loc = pkg.get_root().join("Cargo.lock"); - match load_lockfile(&loc, pkg.get_package_id().get_source_id()) { - Ok(Some(ref prev_resolve)) if prev_resolve == resolve => return Ok(()), - _ => {} - } - let mut e = Encoder::new(); resolve.encode(&mut e).unwrap(); diff --git a/tests/test_cargo_generate_lockfile.rs b/tests/test_cargo_generate_lockfile.rs index 4e7823136..0208bdd77 100644 --- a/tests/test_cargo_generate_lockfile.rs +++ b/tests/test_cargo_generate_lockfile.rs @@ -27,11 +27,8 @@ test!(ignores_carriage_return { let lock = lock.assert(); let lock = lock.as_slice().replace("\n", "\r\n"); File::create(&lockfile).write_str(lock.as_slice()).assert(); - lockfile.move_into_the_past().assert(); - let mtime = lockfile.stat().assert().modified; assert_that(p.process(cargo_dir().join("cargo-build")), execs().with_status(0)); - assert_eq!(lockfile.stat().assert().modified, mtime); }) test!(adding_and_removing_packages { -- 2.30.2